acbdf1241d61253ab1b208f784a403a604afe908,src/main/java/com/continuuity/data/operation/ttqueue/TTQueueNewOnVCTable.java,TTQueueNewOnVCTable,runEviction,#QueueConsumer#number#number#ReadPointer#,498

Before Change


        byte[] entryBytes = evictInfoMap.get(makeColumnName(GROUP_EVICT_ENTRY, groupId));
        if(entryBytes == null) {
          if(LOG.isTraceEnabled()) {
            logTrace(String.format("Not able to fetch maxEvictEntry for group %d", groupId));
          }
          return INVALID_ENTRY_ID;
        }
        entry = Bytes.toLong(entryBytes);
      }
      // Save the least entry
      if(maxEntryToEvict > entry) {
        maxEntryToEvict = entry;
      }
    }

    if(maxEntryToEvict < FIRST_QUEUE_ENTRY_ID || maxEntryToEvict <= lastEvictedEntry || maxEntryToEvict == Long.MAX_VALUE) {
      if(LOG.isTraceEnabled()) {
        logTrace(String.format("Nothing to evict. Entry to be evicted = %d, lastEvictedEntry = %d", maxEntryToEvict, lastEvictedEntry));
      }
      return INVALID_ENTRY_ID;
    }

      final long startEvictEntry = lastEvictedEntry + 1;

      if(LOG.isTraceEnabled()) {
        logTrace(String.format("Evicting entries from %d to %d", startEvictEntry, maxEntryToEvict));
      }

      // Evict entries

After Change


        byte[] entryBytes = evictInfoMap.get(makeColumnName(GROUP_EVICT_ENTRY, groupId));
        if(entryBytes == null) {
          if(LOG.isTraceEnabled()) {
            LOG.trace(getLogMessage(String.format("Not able to fetch maxEvictEntry for group %d", groupId)));
          }
          return INVALID_ENTRY_ID;
        }
        entry = Bytes.toLong(entryBytes);
      }
      // Save the least entry
      if(maxEntryToEvict > entry) {
        maxEntryToEvict = entry;
      }
    }

    if(maxEntryToEvict < FIRST_QUEUE_ENTRY_ID || maxEntryToEvict <= lastEvictedEntry || maxEntryToEvict == Long.MAX_VALUE) {
      if(LOG.isTraceEnabled()) {
        LOG.trace(getLogMessage(String.format("Nothing to evict. Entry to be evicted = %d, lastEvictedEntry = %d", maxEntryToEvict, lastEvictedEntry)));
      }
      return INVALID_ENTRY_ID;
    }

      final long startEvictEntry = lastEvictedEntry + 1;

      if(LOG.isTraceEnabled()) {
        LOG.trace(getLogMessage(String.format("Evicting entries from %d to %d", startEvictEntry, maxEntryToEvict)));
      }

      // Evict entries